Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge misc. MABE2 support branches into MABE_devel #466

Merged
merged 146 commits into from
Jul 19, 2022

Conversation

FergusonAJ
Copy link
Contributor

@FergusonAJ FergusonAJ commented May 18, 2022

Overview

The master branch of MABE2 currently depends on the MABE_devel branch of Empirical.
This pull request is to merge changes into MABE_devel; it does not touch the master branch of Empirical.

We are supporting the following branches of MABE2:

These mostly rely on the following branches of Empirical, which have been merged into this one branch:

Details

  • Changes to systematics to allow it to work with MABE2
  • Add VirtualCPU (include/emp/hardware/VirtualCPU.hpp and include/emp/hardware/VirtualCPU_InstLib.hpp)
    • Implementation of an Avidian as in Avida 2
    • Required minor changes to include/emp/hardware/InstLib.hpp and the files that depend on it
  • Small tweaks to files supporting Avida in MABE2 (e.g., include/emp/functional/AnyFunction.hpp, include/emp/meta/TypeID)
  • A new file, include/emp/math/CombinedBinomialDistribution.hpp that stores multiple instances of emp::Binomial to pull random numbers from a binomial distribution with arbitrary N

@FergusonAJ FergusonAJ merged commit f552287 into devosoft:MABE_devel Jul 19, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants